From 98c7fd4b213d6ebffa36b368f1abe368efa93cdf Mon Sep 17 00:00:00 2001 From: robertl Date: Mon, 27 Sep 2004 01:13:58 +0000 Subject: [PATCH] warning fixes in shapelib. From Alexander Stohr. --- shapelib/shapefil.h | 11 +++++++---- shapelib/shpopen.c | 15 +++++++++------ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/shapelib/shapefil.h b/shapelib/shapefil.h index 86941f796..00d7d0d2b 100644 --- a/shapelib/shapefil.h +++ b/shapelib/shapefil.h @@ -2,7 +2,7 @@ #define _SHAPEFILE_H_INCLUDED /****************************************************************************** - * $Id: shapefil.h,v 1.1 2004/09/20 17:22:55 robertl Exp $ + * $Id: shapefil.h,v 1.2 2004/09/27 01:13:58 robertl Exp $ * * Project: Shapelib * Purpose: Primary include file for Shapelib. @@ -37,6 +37,9 @@ ****************************************************************************** * * $Log: shapefil.h,v $ + * Revision 1.2 2004/09/27 01:13:58 robertl + * warning fixes in shapelib. From Alexander Stohr. + * * Revision 1.1 2004/09/20 17:22:55 robertl * Bring in shapefil.h. * @@ -299,11 +302,11 @@ void SHPAPI_CALL SHPObject SHPAPI_CALL1(*) SHPCreateObject( int nSHPType, int nShapeId, int nParts, int * panPartStart, int * panPartType, - int nVertices, double * padfX, double * padfY, - double * padfZ, double * padfM ); + int nVertices, const double * padfX, const double * padfY, + const double * padfZ, const double * padfM ); SHPObject SHPAPI_CALL1(*) SHPCreateSimpleObject( int nSHPType, int nVertices, - double * padfX, double * padfY, double * padfZ ); + const double * padfX, const double * padfY, const double * padfZ ); int SHPAPI_CALL SHPRewindObject( SHPHandle hSHP, SHPObject * psObject ); diff --git a/shapelib/shpopen.c b/shapelib/shpopen.c index 03ddae4c7..54d04a5dc 100644 --- a/shapelib/shpopen.c +++ b/shapelib/shpopen.c @@ -1,5 +1,5 @@ /****************************************************************************** - * $Id: shpopen.c,v 1.1 2004/09/20 17:21:22 robertl Exp $ + * $Id: shpopen.c,v 1.2 2004/09/27 01:13:58 robertl Exp $ * * Project: Shapelib * Purpose: Implementation of core Shapefile read/write functions. @@ -34,6 +34,9 @@ ****************************************************************************** * * $Log: shpopen.c,v $ + * Revision 1.2 2004/09/27 01:13:58 robertl + * warning fixes in shapelib. From Alexander Stohr. + * * Revision 1.1 2004/09/20 17:21:22 robertl * Check in shapelib and experimental prototype of crude shapefile support. * @@ -162,7 +165,7 @@ */ static char rcsid[] = - "$Id: shpopen.c,v 1.1 2004/09/20 17:21:22 robertl Exp $"; + "$Id: shpopen.c,v 1.2 2004/09/27 01:13:58 robertl Exp $"; #include "shapefil.h" @@ -789,8 +792,8 @@ SHPComputeExtents( SHPObject * psObject ) SHPObject SHPAPI_CALL1(*) SHPCreateObject( int nSHPType, int nShapeId, int nParts, int * panPartStart, int * panPartType, - int nVertices, double * padfX, double * padfY, - double * padfZ, double * padfM ) + int nVertices, const double * padfX, const double * padfY, + const double * padfZ, const double * padfM ) { SHPObject *psObject; @@ -898,8 +901,8 @@ SHPCreateObject( int nSHPType, int nShapeId, int nParts, SHPObject SHPAPI_CALL1(*) SHPCreateSimpleObject( int nSHPType, int nVertices, - double * padfX, double * padfY, - double * padfZ ) + const double * padfX, const double * padfY, + const double * padfZ ) { return( SHPCreateObject( nSHPType, -1, 0, NULL, NULL, -- 2.30.2